Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 15 Jan 2010 17:01:51 +0000 (18:01 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 15 Jan 2010 17:01:51 +0000 (18:01 +0100)
commita5ad50ffd4848f43d723d037574f4dd48d1d0258
treed2f3bf2d95a0e72ae9276eaee9494293d35ea084
parente12fcd6a19e3eb4971a07267c55eb40abe81827a
parent3dd5bb005d7202f4a157de652a514e26743c8b49
Merge from trunk